From: chris@kneesaa.uk.xensource.com <chris@kneesaa.uk.xensource.com>
Date: Sat, 29 Jul 2006 12:06:41 +0000 (+0100)
Subject: Add back changes lost from xen-ia64 cset 10570:8dc4af3f192c
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15765
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=6a999d5ed854727911f9c83c5a0229f6c48d0a32;p=xen.git

Add back changes lost from xen-ia64 cset 10570:8dc4af3f192c
with the new qemu tree.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---

diff --git a/tools/ioemu/vl.c b/tools/ioemu/vl.c
index ca045a3c64..d5f71c45ca 100644
--- a/tools/ioemu/vl.c
+++ b/tools/ioemu/vl.c
@@ -5792,7 +5792,7 @@ int main(int argc, char **argv)
     }
 
     if (xc_ia64_get_pfn_list(xc_handle, domid, page_array,
-                             nr_pages + (GFW_SIZE >> PAGE_SHIFT), 1)!= 1){
+                             IO_PAGE_START >> PAGE_SHIFT, 1) != 1){
         fprintf(logfile, "xc_ia64_get_pfn_list returned error %d\n", errno);
         exit(-1);
     }
@@ -5801,7 +5801,7 @@ int main(int argc, char **argv)
                                        PROT_READ|PROT_WRITE,
                                        page_array[0]);
 
-    fprintf(logfile, "shared page at pfn:%lx, mfn: %l016x\n",
+    fprintf(logfile, "shared page at pfn:%lx, mfn: %016lx\n",
             IO_PAGE_START >> PAGE_SHIFT, page_array[0]);
 #endif
 #else  /* !CONFIG_DM */